This should fail safe, but it is still ugly.
(cherry picked from commit b517ac74d7a2d7b8c104ec3f3ee1f6d56f78581d)