Fix for tablets #3