Fix for hard coded serial number of device