Changed how serial numbers are handled.


Signed-off-by: wflohry <wflohry@gmail.com>