bugfix implementation cluttering prevention