Skip to content

simplify logic

simplify logic #1055