fixing issue #53