Fixes #6 (properly)