Fix issue when entry is object