Fix scheduler