temporary fix for 500 server error