Episode 78 Fixes #44