Better logic for justified holds