Fixed last point issue