You're right. I need to fix this and add some tests for it .:/