Another attempt to fix both iOS and FF