Fix show logic