+1 for the patch in #2