Behaviour change, is this required? I think it should be handled in a different PR