Fixing for grid submission