Device Command Controller Fix