fixing conversions