Trying to fix this weirdness.