fix labeling + NPE