bug fixes for untypeast -> retype