Fix wall overlap