Hot fix for a few edge cases on event add -> redraw