Added hack for labels