Fixing issue #28