Fixing issue #205