fixed gather issues again