Fixed missed merge problem