fix shim BUG