Second fix to pending bug
Merge branch 'master' of https://github.com/joakikr/inf5750