Re #1671 Fixed conversion issue