Revert "minor device handling bug"

This reverts commit e94e739a9132ee76af629416303924866c395a3f.
Fixed mount command