Make conversion safer #489