Fix non-plural id bug