1.2.3 : Fix crash on Tablets