Revision of gres topology bug fix