Episode 80 Fixes #47