[FIXED] Position initial point when points turned off.
Merge remote-tracking branch 'origin/master'