Device update bugfix