Better handle wall values