Fix Ur vs Uy problem