Fixing issue #188