Fixing issue #45