Redo fix for #25
Awesome tip from @tsdh!