Fixed error from cherry pick merge