Fixed issue with String not being converted correctly