Fixes the shim