Fix first bug