fixed event drawing + time change