Switched to new behaviour