Fixing issue #224