fixed subtask bugs