Bugfix in facade