End walls fixing for last buggy commit