fixed for new browsers