Fixed issue with scheduler and order of display