This changes the behaviour, please confirm that this was intended