conversion bug fixes