Resolving Shim issue