fixed x/y issues