fix y? and y. being swapped incorrectly