Fixing issue #53 and #56