Added security to the last point.