Fixed missed changes