Fix po
Prevent hanging on delete empty measures