bugfix nr 2 implementation cluttering prevention