Fix auto_item support