fixed Firefox, Safari issues...