Walls' gaps fixes