Episode 81 Fixes #48