Fix issue #56