Episode 90 Fixes #59