Patched the bug mentioned in #4. This is a PATCH, not a FIX.