MAINT: untested speedup