[CHORE] Bug fix