temporarily removed subtask check