Fixes #3 part 4