Fix Internal Error 2502 and 2503