Fixed issue Issue #2728