* fix bugs for Safari