Converter removed and bug fixed