Fixes #61 in a different way