this should fix the 502 bug