Episode 76 Fixes #34