Fixed ghost facades from pre-6.0.x