Fixed converted class