State pushing fix