Fixed things for real this time.