Fix bug (2)