Fix based on Episode 2