Fix disabled interaction on device
Main changes