Episode 74 Fixes #30