Fixed issue with extra converting plural words to singular