Fixes #1

Can this be a solution?