Fixed plural issue