Found a better fix for #12 that deals with the label problem