Fixing some bugs in level 24
Merge branch 'levelIssue' into develop