Fixed #14 - Fixing safari bug