Made things working across chrome and firefox