Fix intermediate point issue