fix dict issue, add broken tuples