* fix clutter logic