Correct walls via patch from Jorn