Fix performance on schedule