Bug fix for tablets