Card step fix, map loading card step fix