Fix bug of previous commit