Fixing code #210