[Fix #751] Correct some incorrectly merged code