Agreed to change this in the server side.