Fixing issue #52