Fix convolution with latest Astropy version