add device flag since the default changed
add device flag in the right spot..