fa569f85b2
Fixes #2042 (cherry picked from commit 13ff2d4c70bc564525842c31d184127a3934e178)
Fixes #2042 (cherry picked from commit 13ff2d4c70bc564525842c31d184127a3934e178)