#16 cross browser fix