Fix of the waprs points swapping bug