Change to solve error