Fixes #3 part 2