Attempt to fix the bug which causes the map to crash
Merge branch 'master' of https://github.com/karlpa/it1901 into Haakon