Fixes #4 correctly! :)