Fixed some more faulty logic

UCC git Repository :: git.ucc.asn.au