Fix converting issue