FIX: scalar<->label mixups