Merge pull request #4543 from akretz/cnn_fix