Indeed it should, if you have time you can patch it and add test for that particular case. If not, I'll probably do it myself within a week or so.