Improve point fetching logic.