Resolved break resulting from recent merge