fix 500 error
merge