Better fix for firefox