Episode 66 Fixes #29