fix: check for the object itself also