Episode 84 Fixes #52