Hotfix for tabs comments