possibly fixed 500 errors