Fix bug in the last PR