Bug-fix empty device code