My fix for Option::get broke it. All fixed now.