Fixed issue #57!