Now fix to Firefox and safari