diff --git a/lib/skin_parser/skin_parser.c b/lib/skin_parser/skin_parser.c
index f574d3f7a2..689a315bfa 100644
--- a/lib/skin_parser/skin_parser.c
+++ b/lib/skin_parser/skin_parser.c
@@ -958,7 +958,7 @@ static int skin_parse_conditional(struct skin_element* element, const char** doc
     }
     if (element->tag->flags&FEATURE_TAG)
     {
-        if (feature_available)
+        if (feature_available && children > 1)
             children--;
     }
     conditional_end = cursor;
diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make
index 20da68dbe3..e021024901 100644
--- a/tools/checkwps/checkwps.make
+++ b/tools/checkwps/checkwps.make
@@ -22,7 +22,7 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \
            -I$(BUILDDIR)
 
 # Makes mkdepfile happy
-GCCOPTS+=-D__PCTOOL__ -DCHECKWPS
+GCCOPTS+=-D__PCTOOL__ -DCHECKWPS -g
 
 .SECONDEXPANSION: # $$(OBJ) is not populated until after this