Fix convertion