Issue #14 rolled back a fix for chrome compatibility that broke Firefox and Chrome