Episode 86 Fixes #55