Code - Fix bug