Fix bug.

Replace Facade class.