Fixing issue #58