Devices weren't saving correctly - fixed