Fixing issue with level 17