Attempt at fixing problem with dual sweep