Fixed checkbalance
Merge / conflicts