Fixing code #211