Bug fix in Facades