Better discodancing fix