Fixes #2
Not the best fix for the solution.