Fixing weird transitioning issues.