issue 502 fix