FIX swaping coordiates in updateContext logic