On the other hand, I really don't want this shim to become the long term "solution"