Fix for grumpy devices