Fixes part 7 of #4