#187 Bug found and patched.