Correct poor merge from last commit