Now it doesn't show empty pages