Use better conversion method