Episode 87 Fixes #56