Bug 2020 - incorrect SERIAL handling

Summary: incorrect SERIAL handling