Wall-building fix #2