Fix for Safari #5