Fixes #2 (sort of)