fixing g-issues