Fixing push state
remains state
Changes