Might as well fix it immediately. Closes #2