Removed temp wrapper in safari bug fix