fixed all known conversion bugs