Fixed bug where first load would return a 500