Task checking improved