Correcly handle, blah-blah-blah. Closes #2.