Feature/fix tasks