issue #210 fixed