Fixed issue #56