bugs fix cross browser