Feature/fix tasks available