Fixes #7. Double check on that later though.