Episode 88 Fixes #57