type conversion bug fix (merge server commit)