resolve #1917

Comment From: tzolov

Good catch, thank you @jitokim

Comment From: tzolov

Rebased and merged at 6477c0ccfc028c0bf62858ed9b53dd0196bc8241