Fixing the gathering properly