Dislike this change (unless there is a good reason?)