improved tablet behavior again