bugFix: #C3717