gh-757

Need to check this fix (for #757) works cross-browser before merging