Improve conversion #636