fix non object
(cherry picked from commit 5cf0188)