Episode 89 Fixes #58