Fix to #862
Merge pull request #865 from CharonInferar/HousingFix3

Fix to #862