Bug fix related to tablet