Episode 85 Fixes #54