Bug fixing - episode 1