Make us fold less often AGAIN