Episode 75 Fixes #33