Fix/change convert behavior