Issue #2315339 by Liam Morland: Fixed only adding serial number index if it doesn't exit.