Fixing issue #210