Fix the first bug