Skip to content

Simplify logic

Simplify logic #1885