Fixed wall overlap bug