improved floledermanns quick-fix for mobile devices, see #270 and #274