Fix drawing state events