[FOLD] Slightly improve performance