Fix dust problem