Fixing issue #78