More conversion fix