Fixed safari-issues