Fix issue with frozen display