Tasks fix