Pending Goals bug fix on empty goals setup