Fix "long flowing locks" weirdness