Fixed 500 issue