fixiing scheduler issue