Quickfix for "house" becoming obsolete in 6.0.2