Better behaviour on slow configs