Fixed Safari/Firefox issue