Fix bug in previous changes