Fixing bug for tablets