Fixes #3 Part 5