Fixing issue #217.