Fix exception with early redraws