Fixing unsaved Device def