Task scheduling fixed