Fix the 500 error