fixed merge conflict for #1548