Fix merge caused by #1476