[FIX] fix previous merge