Remove extra -s. Fixes #10, #11, #12