[FIX] revert introduced merge bug