gb api is inconsistent on keys, added fix