Facade fix