Fixed an issue with the facade