Fixed issue #57