resolves #3324
Merge pull request #3343 from emrahkocaman/master

resolves #3324