Fix checking for current-ness of officers