Make it actually work when the client code is in external module