Bugfix for TODO and SKIP output