[BUG] Fix bug due to previous merge