slightly better performing fix for #42