Fixed mutli-line issue, server-side changes required also