FIX: Fix cross-browser functionality