that looks like a real bug, is it possible to move this to another bug ?

I really think this should be moved so that we can have 2 different commits