fixed 500 with safari