55372f554f
Fixes #2040 (cherry picked from commit cd28af98eed831e00a400e66b652e6a8d6f9c442)
Fixes #2040 (cherry picked from commit cd28af98eed831e00a400e66b652e6a8d6f9c442)