63b81b801b
Fixes #1354. (cherry picked from commit 637da62e34e676015aa7fbad490cf6f033e55b89)
Fixes #1354. (cherry picked from commit 637da62e34e676015aa7fbad490cf6f033e55b89)