fixed merge conflict for #1354