Fixed: remove device value instead a random device