Skip to content

Simplify logic

Simplify logic #2037