Fixes non-object