Fixed crazy weird issue