fixes scheduling issues