Fix problem with tasks