Fix for shim