Fix gather (grr)