Fix bug version 3