issue #210 Fixing code