Bugfix.

This hopefully fixes #447. I could not recreate this bug, please let me know more about the conditions if it still occurs.  Cheers!!