[BUGFIX] Plural bugfix