Episode 69 Fixes #32