Fixed safari-issue