I dont' like this, @weissjeffm any chance you can take a look at why it's needed?