all conversions fixed