Fixup for Chrome compatibility