ZSS-438 fine tune for firefox