WP-4684 swap position fields