Handle complete states properly