Fix #639 wrong merge