fix conversions, yikes