Type conversion fix