Hopefully fixed gather issue