[CHANGE] Bug fix