Fixed safari exception