fixing bank account rest scenarios