Fix on create tasks