Device Issue Fix

Device Issue Fix