#3931

This is an issue only on master-2.5.

Fixed the issue.

Please check.