fixing issue #56