Fixes #5 for sure