Fix bug where device identifier was not properly returned.