Re: #1629 - tablet fix