fixing issue #210