Fixed issue #51