Fix Tablet support