Fix circular import
Fix item result