Partial fix for #6 on mobile devices