Previous commit missed some cases resulting in errors at runtime (cherry picked from commit 9e830f1c55a9514462290868864b84194aef7b15)
Previous commit missed some cases resulting in errors at runtime (cherry picked from commit 9e830f1c55a9514462290868864b84194aef7b15)