Fixes #75, #76 for all browsers