Fix for Serial Number int cast as string