Fixed issue #53