Custom device fix