bravo: fixed freezes #1