fix plural logic