Full fix for Firefox/Android overflow issue (#87)