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