Fix y not found bug