YELLOW -> CALM counter bug gefixt