fixes#2842 maintenance
Merge pull request #2845 from hasancelik/fixes#2842-maintenance

fixes#2842 maintenance