Fixing issue #55