Fix issue with image size not correctly being passed to convolution operator

Closes #2089
And here