Fixed double label issue