Safari Fix

Fixes #20