Fix and improve part 9

Note to myself: before posting a commit, check what time is it and if
it's very late, stop coding and go to sleep, commit can wait...
*facepalm*