This seemed to be more performant (and reliable for that matter)

This seemed to be more performant (and reliable for that matter) #197