Fix intermittent failure in feature