You're right, we need to handle this too.  I've added a test and fixed the code.