Corrected merge mistake