Fixing issue #185