Device fix

Should we push this change into master? The server should be back up by then