Changed to more efficient conversion.