Yeah, probably. That is the current behaviour though - I'd rather have this change focus on this specific bug and deal with that one in another commit.