MSINM-77: Fix clutering bug