518f52ea6e
Fixes #1291 (cherry picked from commit e0346ff53b8629a368cdbf62cbd347caecfae5fd)
Fixes #1291 (cherry picked from commit e0346ff53b8629a368cdbf62cbd347caecfae5fd)