Fix duplicated local work & error work