ups I'm too sloppy, thanks for the good review
I'll fix the object case and try to figure out a testcase for it.