Fixing issue #217