Fixed #2274
Merge pull request #3220 from adonath/fix_convolution_issues

Fixed #2274