New code - fixes a bug passing back conversions.