Bug Fix : For Point