Lets fix an actual bug while we're at it. Thanks mlocati