Fixed third issues