Fix reace conditions