Fix edit us points problem (iteration 2)