Fix Facade issue