Issue #107: Fix whitespace error
Issue #107: Restore changes for issue #215