Fixed issue with FF