Great! This one needs a test and a fix too.